home *** CD-ROM | disk | FTP | other *** search
/ X User Tools / X User Tools (O'Reilly and Associates)(1994).ISO / sources / ical / rtr / ical next >
Text File  |  1994-10-02  |  3KB  |  99 lines
  1. --- ./Makefile.in.orig    Sat Jan  1 14:41:48 1994
  2. +++ ./Makefile.in    Fri Sep 23 14:44:20 1994
  3. @@ -6,12 +6,12 @@
  4.  
  5.  # The prefix/exec_prefix variables have to start at the beginning of the line.
  6.  
  7. -prefix = /usr/local
  8. -exec_prefix = $(prefix)
  9. +prefix = <installdir>
  10. +exec_prefix = <installdir>
  11.  
  12.         BINDIR = $(exec_prefix)/bin
  13. -       LIBDIR = $(prefix)/lib
  14. -       MANDIR = <installsharedir>/man
  15. +       LIBDIR = <installsharedir>/slib/X11
  16. +       MANDIR = <installsharedir>/man
  17.  
  18.            CCC = @CCC@
  19.      CCCLINKER = @CCCLINKER@
  20. @@ -37,13 +37,13 @@
  21.         FILES1 = *.tcl *.options *.xbm  header.ps tclIndex
  22.         FILES2 = *.tcl tclIndex class.doc
  23.  
  24. -       XINC = @xinc@
  25. -       XLIB = @xlib@
  26. +       XINC =
  27. +       XLIB =
  28.       TCLINC = @tclinc@
  29. -     TCLLIB = @tcllib@ -ltcl
  30. +     TCLLIB = -L/usr/local/xutlib -ltcl
  31.        TKINC = @tkinc@
  32. -      TKLIB = @tklib@ -ltk
  33. -  EXTRALIBS = @LIBS@
  34. +      TKLIB = -L/usr/local/xutlib -ltk
  35. +  EXTRALIBS = @LIBS@ -lX11 -lXt
  36.  
  37.         LIB1 = calendar/libcalendar.a
  38.         LIB2 = types/libtypes.a
  39. @@ -111,13 +111,20 @@
  40.  
  41.  # Installation rules
  42.  
  43. -install: instbin instlib instman
  44. +ULIBDIR = <installdir>/lib/X11
  45. +
  46. +install: instbin instlib1 instlib instman
  47.  
  48.  instbin: ical
  49.      -$(MKDIR) $(BINDIR)
  50.      $(INSTALL) ical $(BINDIR)/ical
  51.      $(INSTALL) calshell $(BINDIR)/calshell
  52.      $(INSTALL) calshellx $(BINDIR)/calshellx
  53. +
  54. +instlib1:
  55. +    -$(MKDIR) $(ULIBDIR)
  56. +    -$(MKDIR) $(ULIBDIR)/ical
  57. +    -$(INSTALL_DATA) startup.tcl $(ULIBDIR)/ical
  58.  
  59.  instlib:
  60.      -$(MKDIR) $(LIBDIR)
  61. --- ./configure.orig    Thu Nov  4 11:57:42 1993
  62. +++ ./configure    Fri Sep 23 14:02:25 1994
  63. @@ -779,7 +779,7 @@
  64.    if test -z "$prefix"; then
  65.      dirs="/usr/local/include /usr/include"
  66.    else
  67. -    dirs="$prefix/include /usr/local/include /usr/include"
  68. +    dirs="$prefix/include /usr/local/share/xutinclude /usr/local/include /usr/include"
  69.    fi
  70.    for d in $dirs; do
  71.      if test -f "$d/tcl.h"; then
  72. @@ -812,7 +812,7 @@
  73.    if test -z "$prefix"; then
  74.      dirs="/usr/local/include /usr/include"
  75.    else
  76. -    dirs="$prefix/include /usr/local/include /usr/include"
  77. +    dirs="$prefix/include /usr/local/share/xutinclude /usr/local/include /usr/include"
  78.    fi
  79.    for d in $dirs; do
  80.      if test -f "$d/tk.h"; then
  81. @@ -851,7 +851,7 @@
  82.  
  83.  # Set default prefixes.
  84.  if test -n "$prefix"; then
  85. -  test -z "$exec_prefix" && exec_prefix='${prefix}'
  86. +  test -z "$exec_prefix" && exec_prefix=<installdir>
  87.    prsub="s%^prefix\\([     ]*\\)=\\([     ]*\\).*$%prefix\\1=\\2$prefix%"
  88.  fi
  89.  if test -n "$exec_prefix"; then
  90. @@ -907,7 +907,7 @@
  91.  LIBS='$LIBS'
  92.  srcdir='$srcdir'
  93.  prefix='$prefix'
  94. -exec_prefix='$exec_prefix'
  95. +exec_prefix=<installdir>
  96.  prsub='$prsub'
  97.  extrasub='$extrasub'
  98.  EOF
  99.